bitkeeper revision 1.284 (3f094675ELP7S7P0f1aKb_RV95PM4Q)

Merge steve/keir changes

diff --cc .rootkeys
index 68581313deb43ba896b8e238f997ac8074d26e7b,d659f6d810e301492da6742574c3adcfb674a27a..e0ec3ea5a818eff6a39bb9776830669fb56ae31a
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -104,18 -87,6 +104,7 @@@
  3ec41f7ecn3uvsSrOVxKC8G8ACuulg tools/control/web/tmpl/xenofoot.def
  3ec41f7ek1RffqN2yRUzSTkD5m1J6w tools/control/web/tmpl/xenohead.def
  3ec41f7e1ZpfCsgQ2qRJBooBn_iRtA tools/control/web/tmpl/xenostyle.css
- 3e4d00468-FN2VDeEHo96zxrMHK_mA tools/domain_builder/Makefile
- 3e4d0046SPau_y0sw2WLJz8QkqNoRA tools/domain_builder/README
- 3e4d0046bbdH0GsI9J_1Eb4ZQHfIiQ tools/domain_builder/dom0_defs.h
- 3ee609abdxnu1GvbtXnPlMfEkTEIwQ tools/domain_builder/dom0_ops.h
- 3e4d0046ouLij_CMN_j7-dUHZIBI_A tools/domain_builder/dom_builder.c
- 3e4d0046EKs06fY0CWDEgZQcn7DYUg tools/domain_builder/dom_kill.c
- 3e4d0046aPbGiRTtdWxqY5b3ytWurA tools/domain_builder/hypervisor_defs.h
- 3e4d00468aE86IfyjfrJwYoxzM7pAw tools/domain_builder/mem_defs.h
- 3e71afadoAI0VvAGKebLpToVQxUKfQ tools/domain_builder/mynewdom
- 3e4d0046VHhXwFuG5FK34AVxqd5A_A tools/domain_builder/newdom
- 3e4d0046IBzDIeaMbQB-e2QB2ahbig tools/domain_builder/vifinit
 +3eb781fc6vgq5yhkJRGDLY9gWWRY2A tools/control/xenctl
  3eb781fdl4lXWYZzmqDDUAYhAThRqQ tools/internal/Makefile
  3eb781fdc539MQQm47rYRCCR3N5i-Q tools/internal/dom0_defs.h
  3ee609b3Yr4aggmLSKmhiIzT8-nURA tools/internal/dom0_ops.h

diff --cc xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
index 90d60f7804cc08f4d56b06c7619f53f343d56aca,8356992f2f3e6dd424db3fc961ac6d95ddea4b60..99b3831bd914485e23519842dcf2b0d3f83426e5
--- 1/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
--- 2/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
+++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
@@@ -46,24 -43,11 +43,13 @@@ typedef struct proc_mem_data 
      int tot_pages;
  } proc_memdata_t;
  
- #define XENO_BASE       "xeno"
- #define DOM0_CMD_INTF   "dom0_cmd"
- #define DOM0_NEWDOM     "new_dom_data"
- #define DOM_LIST_INTF   "domains"
- 
- #define MAX_LEN         16
- #define DOM_DIR         "dom"
- #define DOM_MEM         "mem"
- #define DOM_VIF         "vif"
- #define DOM_USAGE       "usage"
 +#define DOM_PHD         "phd"
- 
  #define MAP_DISCONT     1
  
 +extern struct file_operations dom0_phd_fops;
 +
  struct proc_dir_entry *xeno_base;
  static struct proc_dir_entry *dom0_cmd_intf;
 -static struct proc_dir_entry *proc_ft;
  static struct proc_dir_entry *dom_list_intf;
  
  unsigned long direct_mmap(unsigned long, unsigned long, pgprot_t, int, int);
@@@ -441,27 -360,27 +369,27 @@@ static void xeno_domains_stop(struct se
  
  static int xeno_domains_show(struct seq_file *s, void *v)
  { 
-   dom0_op_t *di = v;
+     dom0_op_t *di = v;
    
-   /*
-    * Output one domain's details to dom0.
-    *
-    * If you update this format string then change xi_list to match.
-    */
- 
-   seq_printf (s, 
-               "%8d %2d %1d %2d %8d %8ld %p %8d %s\n",
-               di -> u.getdominfo.domain, 
-               di -> u.getdominfo.processor,
-               di -> u.getdominfo.has_cpu,
-               di -> u.getdominfo.state,
-               di -> u.getdominfo.hyp_events,
-               di -> u.getdominfo.mcu_advance,
-               (void *)di -> u.getdominfo.pg_head,
-               di -> u.getdominfo.tot_pages,
-               di -> u.getdominfo.name);
- 
-   return 0;
+     /*
+      * Output one domain's details to dom0.
+      *
+      * If you update this format string then change xi_list to match.
+      */
+ 
+     seq_printf (s, 
+                 "%8d %2d %1d %2d %8d %8ld %p %8d %s\n",
+                 di -> u.getdominfo.domain, 
+                 di -> u.getdominfo.processor,
+                 di -> u.getdominfo.has_cpu,
+                 di -> u.getdominfo.state,
+                 di -> u.getdominfo.hyp_events,
+                 di -> u.getdominfo.mcu_advance,
+                 di -> u.getdominfo.pg_head,
+                 di -> u.getdominfo.tot_pages,
+                 di -> u.getdominfo.name);
 -
+     return 0;
++
  }
  
  struct seq_operations xeno_domains_op = {

diff --cc xenolinux-2.4.21-sparse/arch/xeno/kernel/process.c
Simple merge

diff --cc xenolinux-2.4.21-sparse/include/asm-xeno/processor.h
Simple merge